Some shit fixes