Bug fixes (no errors but not functional)