Fixed swaps in code/Message.cpp and code/Request.cpp for consistency