Too long integer fix
Added Container Location resource
Join Builders fixes
Select Builder fixes