Fixes in APRS