Few things fixed