Apply small fixes