Server fixes + log