Various fixes for issues raised