Minor fixes to pikmin