Build fixes version 2