Embarassing fixes

Don't ask me why it worked before...