Committing some hacky fixes so i can log some things on my lappy.