Fixed build, some changes here and there.