Prevent some errors
Small bugs