Misc. adjustments