Fixed build errors. Still adding environment