Fix BIT #1678 build errors and re-add to build