Fix known issues