More Error Fixing