Fixes and comparition