Code: Misc. fixes.