Various fix for 2.3.0

Fix issue #82 and various build warnings