A stupid `!` error and some API retardation fixes.