Modifications to BuildFiles to compile