Minor: fix warnings
Minor: rename