Fixed issues from https://github.com/cdumez/sysapps/pull/1