Merged fixing issues