Fixing trivial problems