Fixed Errors after testing

Per Tyson's test