fixes for jar and other shit