Fixed some non-blocking build errors