Fixed src
build corrections