Fix issues after porting to Skittle