Fixes to elAndBangCore based on martins comments