Merged all fixes