Fixes done