Pull in Make surfaces visible by default, fix initialization