Small fixes (excluded garbage from build)