fixes for advanced