Fixes made