2.5.8. Serries bugfixes

Series of fixes I did for people who responded on the forum.