Some cosmetical fixes