Fix BUGS -- see BUGS file