Fixing some minor bugs...