Fix & cleanup from last commit