Code: Fixes minor bugs.