Add some minimization optimizations

Signed-off-by: Fabian Deutsch <fabiand@redhat.com>