Further changes to build