* Fixed build further
* Actually ready for release