Build enhancements

Not that it really matters, but could this be set in the line 123?