Some fixes for solution to complie