General fixs arround the code base