Fixing log dir and ensure expanded paths