Fixed issues blocking build