Implementing suggested fixes