Small improvements on require