Small fixes
Release commit