fixed compiling issues