Build #2

Including some fixes