JBTIS-289 - Build fixes and adjustments based on Max feedback