Boat Builder: Release 1.27 Fix some bugs

Release 1.27 Fix some bugs