:moyai: Some tweaks here and there