Fixing trivial issues