Update minor bugs / fixes