Hotfixes for abas-eB