Merge from mkobel master

Fix some syntax
Memory + swap limit