Two bugs solved
comit