Cleaned up last commit's failures