I have the same issues with the doors, however my beeper locks only the boot (Which is fine provided i hand lock the doors before pressing buzzer).
If you do figure out the fix for the C/L I would...