Fixed a couple of things with the structure, whoops!

Signed-off-by: Andoni Aguirrezabal <aaguirrezabal@live.com>