Small fixes, new builds generated