Fixing jars and other minor stuff