Memory requirement fixes