Fix some warnings
Prepare for release