Bugfix and better handler attachment specs