Fix extra stuff