Filtered null values on allocation fix & other minor bugs