Fix known bugs