Misc dimagimon fixes