Fixes added