Few fixes

Stop breaking it