Changed message constructors + small fixes

Signed-off-by: Martin Tange <mktange@gmail.com>