Fixes And stuff