Some more adjustments (Issue #475)