Cleaned up compiler errors