Build fix and minor changes