Master file bug fixes