Minor fixes

@danielfrndz Please review and merge.