More fixing my mistakes