Fixes + Android Broadcasting