Fix few things completely wrong in first release