Fixes for compile warnings (#103, #107)