Small fixes
Version 1.3.0-beta