Small fixes and beta4 version