Fixes for jam format