fixes in compilation