Modifier fixes

Signed-off-by: ZNickq <teapa011@gmail.com>