Support environment and other fixes