Fix static environment usage