Some more minor adjusments