Finalised the fixes