Minor-Fixes