Misc updates to make jbeams a little bit more sturdy