Fix some copy pasta and missing imports