Minor fixes based on @wasade's review