[FIX] Several minor fixes and images cleanup