Fixes for the first release