Random fixes

Maybe I will add real contributions after starting using this module. :smile: