bugfixes

Signed-off-by: Marfyy <martinsafsten@gmail.com>
Merge remote-tracking branch 'remotes/origin/master'