Last minute patches, part 4

- Fixes invalid capabilities given from client for CAP REQ in addition to the previous fix for CAP ACK