fixes for srb
master