Development tweaks