Fix issues for it to compile