OOPs! Fixed build errors