hopefully fixed compiling issues