Erroneous code fix
Code style fix
Map canvas size fix