some changes to be able to compile