Prepare release
Fix build