Squashed multiple fixes

Signed-off-by: Dragon <dragon7780@hotmail.nl>