Fixes we needed