Fixing errors added during latest merge/pull