Small fixes before initial release