Fix/build warnings