fixing some warnings / unused vars