General bug fixes
Credit Module