Analogue Bugs Fixed