Some small changes to reduce the jar size