Fixing my own dumb mistakes