Another bugfixes

;p