[audi_bhoy]

For the bolt catch, I've had good sucess sticking a shim under the bolt catch, where it meets the mag's follower.