Fixed additional errors
Others fixes... again ... :(