Fix some bugs

Made at BeGeistert :P