Minor fixes ( I hate branches )