Fix some bugs with versioning. Works everywhere now