Fix some problems in the Website... modules.