Errors cleaned up