Misc fixes, renamed module