Assets directory and memory bugfix