Version bump, compilation fixes, scratch env. fix