Fix some minor bugs from the forum