Some personal fixes.