Fixing my obvious mistakes...