Misc ajustments