Fixing multiple issues