Fixed a couple of things

Signed-off-by: Andoni Aguirrezabal <aaguirrezaba@mail.usf.edu>