Fixed performance imrpovements