Solved several shadowing/ambiguous messages