Synth module: Cleanup and Android fixes