Few more changes to ensure clean up