diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index 57ba9766be..3878310429 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -124,6 +124,11 @@ msgstr ""
 msgid "%q is %q"
 msgstr ""
 
+#: ports/raspberrypi/common-hal/wifi/Radio.c
+#: shared-bindings/microcontroller/Processor.c
+msgid "%q is read-only for this board"
+msgstr ""
+
 #: py/argcheck.c shared-bindings/usb_hid/Device.c
 msgid "%q length must be %d"
 msgstr ""
@@ -298,7 +303,7 @@ msgstr ""
 msgid "'%s' object doesn't support item deletion"
 msgstr ""
 
-#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
+#: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
 msgstr ""
 
@@ -1856,7 +1861,7 @@ msgid "Random number generation error"
 msgstr ""
 
 #: shared-bindings/memorymonitor/AllocationSize.c
-#: shared-bindings/pulseio/PulseIn.c
+#: shared-bindings/pulseio/PulseIn.c shared-module/displayio/Bitmap.c
 msgid "Read-only"
 msgstr ""
 
@@ -1864,10 +1869,6 @@ msgstr ""
 msgid "Read-only filesystem"
 msgstr ""
 
-#: shared-module/displayio/Bitmap.c
-msgid "Read-only object"
-msgstr ""
-
 #: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
 msgid "Received response was invalid"
 msgstr ""
@@ -3071,10 +3072,6 @@ msgstr ""
 msgid "format requires a dict"
 msgstr ""
 
-#: shared-bindings/microcontroller/Processor.c
-msgid "frequency is read-only for this board"
-msgstr ""
-
 #: py/objdeque.c
 msgid "full"
 msgstr ""
diff --git a/ports/espressif/esp32-camera b/ports/espressif/esp32-camera
index 4ff7f348d0..54c3f61c86 160000
--- a/ports/espressif/esp32-camera
+++ b/ports/espressif/esp32-camera
@@ -1 +1 @@
-Subproject commit 4ff7f348d0713ea8eca022f73a059b0fe0934531
+Subproject commit 54c3f61c864c3d3ffd779042454554045b9dd9d2
diff --git a/ports/raspberrypi/common-hal/wifi/Radio.c b/ports/raspberrypi/common-hal/wifi/Radio.c
index 4cd80fb4b7..db21dd333b 100644
--- a/ports/raspberrypi/common-hal/wifi/Radio.c
+++ b/ports/raspberrypi/common-hal/wifi/Radio.c
@@ -64,8 +64,8 @@ static inline void nw_put_le32(uint8_t *buf, uint32_t x) {
     buf[3] = x >> 24;
 }
 
-NORETURN static void ro_attribute(int attr) {
-    mp_raise_msg_varg(&mp_type_AttributeError, MP_ERROR_TEXT("'%s' object has no attribute '%q'"), "Radio", attr);
+NORETURN static void ro_attribute(qstr attr) {
+    mp_raise_NotImplementedError_varg(translate("%q is read-only for this board"), attr);
 }
 
 bool common_hal_wifi_radio_get_enabled(wifi_radio_obj_t *self) {
diff --git a/shared-bindings/microcontroller/Processor.c b/shared-bindings/microcontroller/Processor.c
index 3b671d0c7b..2479638a92 100644
--- a/shared-bindings/microcontroller/Processor.c
+++ b/shared-bindings/microcontroller/Processor.c
@@ -72,7 +72,7 @@ STATIC mp_obj_t mcu_processor_set_frequency(mp_obj_t self, mp_obj_t freq) {
     uint32_t value_of_freq = (uint32_t)mp_arg_validate_int_min(mp_obj_get_int(freq), 0, MP_QSTR_frequency);
     common_hal_mcu_processor_set_frequency(self, value_of_freq);
     #else
-    mp_raise_msg(&mp_type_NotImplementedError,translate("frequency is read-only for this board"));
+    mp_raise_NotImplementedError_varg(translate("%q is read-only for this board"), MP_QSTR_frequency);
     #endif
     return mp_const_none;
 }
diff --git a/shared-module/displayio/Bitmap.c b/shared-module/displayio/Bitmap.c
index 7a1b3e6b17..6c64830dce 100644
--- a/shared-module/displayio/Bitmap.c
+++ b/shared-module/displayio/Bitmap.c
@@ -117,7 +117,7 @@ uint32_t common_hal_displayio_bitmap_get_pixel(displayio_bitmap_t *self, int16_t
 
 void displayio_bitmap_set_dirty_area(displayio_bitmap_t *self, const displayio_area_t *dirty_area) {
     if (self->read_only) {
-        mp_raise_RuntimeError(translate("Read-only object"));
+        mp_raise_RuntimeError(translate("Read-only"));
     }
 
     displayio_area_t area = *dirty_area;