fixes for restructure