Some personal fixes