Fixes and new build