Implemented fix for some CF in broadcast save handling and implemented most likely fixes for #226