latest fixes for Fabian