Fixing my own mistakes