#323: Code review issues fixes