Fixed all the compiler errors. One more make and then test