Some personal tweaks