Small adaptions at runtime