Fixes to elAndBangMore