Small fixes and module updates