Quick fix bugs