Big time bug fixes