Implement fixes for review remarks