Fix Bugs that i created myself on purpose