Fix/quick fixes