fixes for rebuild