FIxing some things