Fixing small bugs, thanks Rene =)