Dev Misc. insignificant changes