Debugged "some" errors