Fixing part of the problems