Fixy minor bugs