Fix minor bugs - See the bugtracker on drive for more information