Minor fixes, images optimization