More consistent with Selene and fixing new compiling errors.