Fix rate limiting attribute compatibility

Also some minor fixups to core code.