Misc dev efforts