Some more annoying fixes