Updated build
Small updates