Fix some more ###'es
Fix return value.